Add ToolTarget to bootstrap
#143641
Add ToolTarget to bootstrap
#143641
Conversation
rustbot
added
A-testsuite
rustbot
added
the
S-waiting-on-review
|
#142357 was merged, so undrafting. |
This comment has been minimized.
This comment has been minimized.
| impl LldWrapper { | ||
| /// Returns `LldWrapper` that should be **used** by the passed compiler. | ||
| pub fn for_use_by_compiler(builder: &Builder<'_>, target_compiler: Compiler) -> Self { | ||
| Self { | ||
| build_compiler: get_tool_target_compiler( | ||
| builder, | ||
| ToolTargetBuildMode::Dist(target_compiler), | ||
| ), | ||
| target: target_compiler.host, | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Discussion: to double-check, under dist mode, what we want to happen is
There was a problem hiding this comment.
Re. test coverage, should we explicitly add coverage for ./x build compiler/ w/ e.g. llvm-bitcode-linker under cross-compile at stage 2? Or would that be redundant? 🤔
There was a problem hiding this comment.
Yeah, this is the optimal case to avoid needless rebuilds. We don't need to build lld-wrapper with stage 2, we just need to build it with an in-tree compiler (so stage 1), both to enable cross-compilation, and to ensure that we build distributed tools with in-tree code (because of stdlib security fixes and stuff).
We already have build_compiler_tools_cross, which builds the compiler with linker tools in stage 2, AND cross-compiles. I think that's enough.
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Clarified comments. @rustbot ready |
rustbot
added
S-waiting-on-review
Oh, you thought I'm done with refactoring bootstrap tools? Na-ah, think again! After the failure of #143581,
ToolTargetis back with a vengeance. This time, I implemented the test changes and tool cleanups without forcing these tools to be built with the stage0 compiler.There are still some small wins though,
LlvmBitcodeLinkernow starts at stage 1, and not stage 2. Cargo should also be ported to this new mode, but I'm leaving that for a follow-up PR.Hopefully X-th time's the charm 🤞
r? @jieyouxu